use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs

Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkiconfactory.c:
        * gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up
        item factory so inlined pixbufs actually work.

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 22f1234cc94c0ff59884499a851adb30ded8b73b..3ea1084ce62c17df97bf319505a93c45ab2e96cc 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -154,8 +154,8 @@ CLEANFILES += $(noinst_DATA)
 
 pixbuf_dir = $(top_builddir)/gdk-pixbuf
 
-gtkstockpixbufs.h: $(pixbuf_dir)/make-inline-pixbuf $(IMAGES)
+gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES)
        GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \
-          $(pixbuf_dir)/make-inline-pixbuf $(srcdir)/gtkstockpixbufs.h $(VARIABLES)
+          $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES) >$(srcdir)/gtkstockpixbufs.h
 
 EXTRA_DIST = $(IMAGES)

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 00aacddafe4b435f8cbabacf673284653a7ea0b5..91678f469a067d33a9bf9a7e54bf00a9d29b7464 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -3101,7 +3101,7 @@ static GtkItemFactoryEntry menu_items[] =
   { "/_Preferences/Shape/_Oval",        NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
   { "/_Preferences/Shape/_Rectangle",   NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" },
   { "/_Preferences/Shape/_Oval",        NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" },
-  { "/_Preferences/Shape/_Image",       NULL, gtk_ifactory_cb, 0, "<ImageItem>", (gchar**) apple, sizeof(apple) },
+  { "/_Preferences/Shape/_Image",       NULL, gtk_ifactory_cb, 0, "<ImageItem>", apple },
 
   /* For testing deletion of menus */
   { "/_Preferences/Should_NotAppear",          NULL, 0,               0, "<Branch>" },